Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 28 Dec 2011 05:09:13 +0000 (21:09 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 28 Dec 2011 05:09:13 +0000 (21:09 -0800)
commit17c4c7e5350c75e0cb1826043d62aaa65173d917
treead0e353ff3588ad3f97163aa60797e9c9124c3d0
parent6a95a341dc40ab236f4f34a54c78d849de1989bd
parent1875e2fd872d4d3803188decb092f7bc078b1aae
Merge from trunk.